Skip to content

Feat/3.1.0 beta1: tenant admin column + knowledge/workstation fixes - #2722

Merged
jieyuhuayang merged 10 commits into
releasefrom
feat/3.1.0-beta1
Nov 17, 2026
Merged

jieyuhuayang merged 10 commits into
releasefrom
feat/3.1.0-beta1

Conversation

@jieyuhuayang

Copy link
Copy Markdown
Collaborator

把 feat/3.1.0-beta1 合入 release,用于在 test 环境(116:3001)验证。

本次带入的提交:

  • 0e97509 feat(tenant): 租户列表新增「管理员」列和独立的管理员设置弹窗(原入口藏在「用户数」里);后端在租户列表项中返回 admin_users,GET /tenants/{id}/admins 额外返回 users
  • 2bba88c fix(knowledge): 让文件解析失败展示可定位的原因
  • c0a32dd fix(knowledge): restore admin file actions and retire tenant resource routes
  • 133f8a3 fix(workstation): decouple settings from models and fix tenant tool listing
  • 15b5e8d fix(department): reset directory after mounting child tenant

验证:租户页 vitest 16 passed;后端租户管理员测试 20 passed。

🤖 Generated with Claude Code

zgqgit and others added 10 commits November 17, 2026 16:55
Relays often carry the same model name (two "deepseek-v4.1-flash" from
different providers), and the base model picker listed only the name, so
an administrator could not tell which one they were choosing. Each option
now reads "model (provider)", which also shows in the trigger once chosen.
- 预览失败时保留领域错误码与消息,未知异常仍收敛为通用错误
- 通用解析失败在详情中补充错误码,便于定位与追溯
- 补齐中英日文案并增加后端回归测试
… dialog

The only way to set a Child Admin was clicking the user-count number in the
tenant list, which nobody discovers. The list now has an Admins column that
shows each tenant's admins (or "Not set"), with a Manage link opening a
dedicated dialog: current admins on top, search this tenant's members below.
Grant/revoke take effect per click, so the dialog only has Close.

Backend: tenant list items carry admin_users [{user_id, user_name}] (null when
the permission lookup fails, so the UI can tell failure from "none"), and
GET /tenants/{id}/admins also returns users with names.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
## What

F016 后续:**后台「客户端 → 模型权限」的基准模型下拉框,每一项标出服务商。**

- `BaseModelPicker.tsx`:选项从只显示模型名,改为「模型名(服务商)」,选中后输入框里也显示服务商;下拉框从 `w-72`
加宽到 `w-96`。模型名仍优先用管理员设的「显示名称」。
- 新增文案 `dsh.pricing.baseModelOption`(中 / 英 / 日)。

## Why

不同中转站经常提供同名模型(比如两个服务商各有一个
`deepseek-v4.1-flash`)。原来的下拉框只列模型名,管理员分不清选的是哪一个(Callum 在 116
上自测时发现)。没有用「服务商 / 模型名」的前缀写法,因为有些厂商的模型 ID 本身就带「/」(如硅基流动的
`deepseek-ai/DeepSeek-R1`),会更难读。

## Test

- `BaseModelPicker.test.tsx`:新增用例,两个同名模型按服务商区分、选中后保存的是对应
id(旧代码上失败);原有用例按新标签更新。`UserSelectableModels.test.tsx` 通过。
- `pnpm --filter bisheng lint`、`pnpm --filter bisheng typecheck`、`pnpm
check-i18n` 通过。
- `src/pages/ModelPage` 下全部测试:1 条失败 `ModelAccessDialog.test.tsx > saves
visibility without sending a credit multiplier`,把本 PR 的文件换回 beta1
原版后同样失败,属于 beta1 原有问题,与本改动无关。
- 真实环境:本机网页代码用本分支、接口连 116,管理员登录后下拉框显示「deepseek-v4.1-flash(阿里云百炼
测试每日调用次数)」等,选中后输入框带服务商。

## Related

- #2698(F016 积分按模型真实价格扣)
- #2712(F016 后续:缺价按免费计费)

合并目标:`feat/3.1.0-beta1`(基于 4ab062c,只含本修复一个提交)。
@jieyuhuayang
jieyuhuayang merged commit e5f7d64 into release Nov 17, 2026
9 of 11 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants